Invoke xmlstarlet as xmlstarlet rather than as xml.

diff --git a/debian/changelog b/debian/changelog
index 5a315feb388e5ef76eda28973410a081dac97332..4bf73a71f3195d132e82afa28342b0655ef8d82c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,10 @@ emacs22 (22.2+2-4) unstable; urgency=medium
     Joachim <svenjoac@gmx.de> and Michael Berg <michaeljberg@gmail.com>.
     (closes: #499568)
 
- -- Rob Browning <rlb@defaultvalue.org>  Tue, 14 Oct 2008 21:15:42 -0700
+  * Invoke xmlstarlet from flymake as xmlstarlet rather than xml.  Thanks
+    to Jussi Judin <jjudin+debian@iki.fi>. (closes: 447378)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Tue, 14 Oct 2008 21:22:59 -0700
 
 emacs22 (22.2+2-3) unstable; urgency=medium
 

diff --git a/debian/patches/fix-flymake-xmlstarlet-invocation.diff b/debian/patches/fix-flymake-xmlstarlet-invocation.diff
new file mode 100644 (file)
index 0000000..471df2f
--- /dev/null
+++ b/debian/patches/fix-flymake-xmlstarlet-invocation.diff
@@ -0,0 +1,24 @@
+* Emacs now invokes the correct xmlstarlet executable on Debian systems.
+  Patch: fix-flymake-xmlstarlet-invocation.diff
+  Provided-by: Jussi Judin <jjudin+debian@iki.fi>
+  Date: Sat, 20 Oct 2007 14:42:02 UTC
+  Added-by: Rob Browning <rlb@defaultvalue.org>
+  Status: Debian specific
+  Bug: 447378
+
+  Emacs invokes xmlstarlet rather than xml, which is the correct
+  executable name on Debian systems.
+
+Index: sid/lisp/progmodes/flymake.el
+===================================================================
+--- sid.orig/lisp/progmodes/flymake.el
++++ sid/lisp/progmodes/flymake.el
+@@ -1756,7 +1756,7 @@
+ 
+ ;;;; xml-specific init-cleanup routines
+ (defun flymake-xml-init ()
+-  (list "xml" (list "val" (flymake-init-create-temp-buffer-copy 'flymake-create-temp-inplace))))
++  (list "xmlstarlet" (list "val" (flymake-init-create-temp-buffer-copy 'flymake-create-temp-inplace))))
+ 
+ (provide 'flymake)
+ 

diff --git a/debian/patches/series b/debian/patches/series
index 85887617b464f1e42ce409a1dcd02fc6c753753e..f5560549cbec302ad8d429ee87abdcf1687f125d 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,4 +13,5 @@ fix-mule-select-safe-coding.diff
 look-for-news-to-find-etc.diff
 fix-woman2-th.diff
 fix-python-module-handling-cve-2008-3949.diff
+fix-flymake-xmlstarlet-invocation.diff
 autofiles.diff